Moved titles to overlays

Closes #2 and #3