redesign markup and style