Update for 0.9

UI changes, clean-up