Various layout fixes for bootstrap 3