Temporary changes to control panel in order to make it navigable