Fixing some Bootstrap2 to Bootsrap3 conversion issues