More work on panel controller