UI

Made some UI progress
Merge remote-tracking branch 'origin/UI'