UI modifications
Merge branch 'master' of github.com:conradolega/party