Clean up and some CSS
Merge of master