Started work on plain page editing, added in layouts and removed issues