Change structure to use few controller. Implement rect layout under new structure.