Merged Colin's Changes by hand to avoid having to refix border-radius