Modified display layout - moved button Delete
Deleted unneeded classes