Few minor fixes to org panel