Incomplete work on popup controls