UPGRADE - Panel is copied from osmani