Add - Better grouping of entries and layout fixes