Various fixes + CirclePanelView