Style cleanup and more bootstrap goodness