More tweaks to work overcome Bootstrap 3