Updated some Buttons as per requirement from Apple