fixed ordering issue and bootstrap issues