Cleaned up parcelable; fixed upgrade screen layout