Overlay changes

Reviewers: @donovanhide