Tightened up overlay
Revised organize page