proper header/navbar
minor formatting/layout changes
more form cleanup