modification to the login page
login page beautified
resolved conflicts and merging issue-190 into develop