all style tweak requests by Manav are fulfilled
merged the style fixes in manav_demo