Working overlay, looks rubbish.
Tidying and GUI improvements