UI fixes not integrated visually.
Merging in Nick's changes.
Added the UI to the scene.