Moved the ui elements from examples to the main source tree.
Fixed conflicts