Refactor and better CSS.