Added user functionality and updated pre-and-post login screens