Fix View Issues + Add App Groups