CSS fixes and testing