Fixes bug 1060157 - [RPP] Main panel