Fixed flickering serve buttons