Minor white-space issues here (the CSS shouldn't have been indented), but I'll fix that with a manual merge.