Update 20

Still positioning the upgrade button, fixed minor crashes.