#22 made more clicable area for buttons