some style, header and form cleanup

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
Merge branch 'style' into develop