Added ids to the for attr of labels
Code housekeeping and bug fixes