fix bug & login page (undone)