changes in the authentication and some design fixes done