Extra button functions improvement