Aggregator app - minor fixes

Minor visual changes & refactoring