Added extra label + button functions