More work on upgrade to Bootstrap 3