Fixed merge of old UI stuff in root
Merge remote-tracking branch 'origin/master'