Beautified When/Where Activity and added check for login state