Refactored menu button and transitions