Unstable

Merging unstable back to master; starting new UI and this is now stable.