Fixing up the controls.. still need to work on popup