white space and refactor css