updated login and tidied categories