Overlay changes

Reviewers: @donovanhide, @ximinez, @rec
What should we do if there's an error?