updating items, autopopulating dashboard
fixed merges