Fixed issue with label not selecting related checkbox because of ids exi...

...sting in multiple places. Added input inside label instead.