Added CSS, cleaned up