Started some UI stufuff.
Merged.