Small update to the data model and Parcel model class
Tidied up the Watch app interface