Aggregator app - improvements

Added bunch of improvements including node renaming and level 2&3 switching