Minor cleanup+merge fixes on Paul's CSS skin