Improved CSS and bootstrap implementation