got more ui done
advanced ui
merging ui upgrade