change css and refactor