Updated some layout since we had Bootstrap upgrade