cleaning up layouts and fixing delete confirmation