Make sure that the right menu links work correct on the website
Remove fieldset from login page