Update models for merge without UserProfile and updates for dash view
Merging models without UserProfile and PebbleToken additions that Hunter made