[origin-ui-180] Several code improvements
Merge pull request #607 from fabianofranz/master

Merged by openshift-bot