Updates in ui/node merged into ui/unified
Merge pull request #2 from marekjm/ui

Updates in ui/node merged into ui/unified