Development ui

merge ui with master