Several changes regarding CSS
Merged with master