Big changes in ui.
Added necessary files.
Merge branch 'ui-impl' into ui