Update Bootstrap and cleanup layouts