Bug fixes; new CSS theme