Mostly CSS fixes