Genie Animation menu implementation
Conflicts fixed