main ui and game ui done
Merge origin/master