UI fixes based on the updated bootstrap css