added option to login with email OR username, logout option only available if logged in, updated session & user views