login features added to main file
Mergiing template work