Added way/form and cleaned up logged in nav