added files and some styles for navbar
solved merge conflict