-Fix the header layout
-Fix double login-button