Merged sql controllers (circular dependency)
Updated layout