Cleanup layout, Update Bootstrap