Switch to built-in navbar, add contact details
Add email address to contact section
Organization cleanup