Added labels, buttons