Refactoring of the layouts
Refactored the components in the node UI to a sane structure