Added CSS, and some new fixes