major code refactor
added navbar implementation