btn styles, editing high light, de-modularize