UI added
slight update
basic ui functionality added
Merge branch 'master' into ui