Move decorations into separate controller.