More work on right panel to make it work