Style submit form; fix routing
Merge branch 'layout' into develop