Dev

Merge changes from cleanup into ui branch (work in progress)