changed style of login form
fixed conflic
fixed conflic again