Fixes

Button to menu and structural fixes