UI and Bug Fixes -- Axis Menu