Working on login system and fixed some bugs