Form ui complete

I finished off the UI, tried to push, and clashed with some work you guys have done without me.

I figured I'd just make a new branch - this one has the UI finished.