Refactored snippet layout - big effort (8 hours)