move nav around, fix up submit form