Minor bug fixes. Added navbar