Fix Indentation, App grouping