Issue #317, navbar and fixing identation