Finishing touches to checkbox hack