Optimized structure.
Added todo for check list/page delete