refacotring of plane upgrade screens