Final layout pass

-Change create overlay