Aggregator app - improvements

Another bunch of improvements