fix nav active state
css fixes, cleanup