Change layout of button to allows using of gamepad #1765
Fix LayoutManager to handle fitting when the container has padding #1766