Lot's of changes, first round of UI work.
Merge pull request #1 from mattvagni/master

Lot's of changes, first round of UI work.