Upgrade layout to Bootstrap 3