Story 1347 1/2: Use new overlay for this page has issues

Update resources so that it is easy to swap out Overlay for OverlayNew
Add back behaviour to new overlay
Restore margins to cleanup template list
This patch DOES NOT address styling of icons

Change-Id: Ica89fee9b3a5d60ab677205b48bafce55b15dc2e