Overlay changes

Reviewers: @donovanhide, @ximinez, @rec
autoCorrect