Clean up some code.  Add bootstrap layout.