Overlay component, hard turns

A few more tweaks too