Changed to icon buttons on new tag and new measurement. Playing around with delays on animation to prevent inital delay.