Improving implementation of both buttons clickable.