Change in Bootstrap theme and a few UI tweaks