Revised layout with bootstrap
Fixed layout and indentation