Turned right user info in nav bar into a pill
New Sidebar + content boxes
Fixed conflicts