Bug fixes and UI overhaul

new tertiary menu system in progress