css changes and refactor.