restructure styles
update title & add class