Some layout changes and checks for logged in
Merging some controllers