Made changes to navigation bar and fixed mail form