New checkbox tags

Cleaned up merge of checkbox-tags