Final fix on button