More UI Edits! I have started to fuse the UI with the back end code

ZH
Merge remote-tracking branch 'origin/master'