Improved navigation and forms