cleaned up some details, added navbar