fixed styles in login page
fixed login page
fixed merge bug