Fixes, redesign, active menu states