Minor improvement to spots and buttons