Cleanup and Conversion to Bootstrap