Replaced sidebar with masthead navbar and other misc changes