Improve bootstrap layout