Updates 2.0

Mostly UI updates.