Added new ui elements. Previously had datetime elements, but removed those for bug testing. Still doesn't work.
Merge remote-tracking branch 'upstream/master'