css clean up and rebase