Control overlay v2

Updated version according to feedback