Added new layouts and some improvements
Login control improvement