Some UI improvement...
Merge branch 'develop'