First commit on ui branch
UI commit
merge UI branch