refactor styles, rebuild