CSS completed, ready for merge