CSS Updates

Includes platform fixes, ready for QA