Added datapackages to UserProfile (+ a button to add new ones)

Also cleaned stuff up.