Cleaned up controllers and updated bundles