Another overlay pages rework. controllers removed.