Add navbar, work on more elements