fixed issue #6; improved navbar