CRAAG2 Layout: More rework.
Run Hackvana DRU and correct errors.
CRAAG2 Layout: Fix text placement.