More menu and ui fixes.