Cleaning up some markup that only shows up for auth users; adding some text; moving around blocks