fix buttons when not logged in
updated restricted to Pages#show
fix conflict files
git head mistakes
clean up session/new again