Some view changes to control panel index