Cleaned up upgrade ui