General cleanup and CSS work