Fixed file names and add user login