Changed styles&Updated controller