Fixed Login and added Flat UI