Ensure form errors are shown properly
Add greeting and 'sign out' link to appropriate place