Merge "Adding animation to edit widget button" into main