Improve bootstrap and CSS styles