Added more work converting to Bootstrap