Merge pull request #1019 from laanwj/2012_03_uirefactor