Delete button on gridview items
Delete button on gridview items
Loading templates in edit mode working.
Merge conflicts solved
Imports updated.
Merge branch 'menu_layouts' into start_up_screen