Refactored menu styling and animation
Resolved merge conflict