refactor & css add