Add UI widget expansion
Merge pull request #166 from hanrea/master

Add UI widget expansion