Some work on css, and minor changes