basic ui

first commit
Merge branch 'master' into premium/master