Switched to new bootstrap layout