Development

Lots of ui re-factoring.