dezuglyfication :-) another take at the category layout consistency. Not necessarily more DRY but seems to work.