FrontEnd: Fixing issue #143 -> overlay is now cleaned up