Minor bug fixes, cleanup.
Added navbar.