Moving repeatative html up the stack and removing hard coded labels