Improved layout (was mis-using the Bootstrap 3 classes in the conversion)