Cleaned up menu and selects a great deal, including using native selects instead of onyx pickers where possible