updated theme name and styled navbar
merging from fmaster