add form, fix navbar