Some tweaks for layout problems with SquareButton

I also want to add some integ tests to make sure things are being calculated properly for different layouts, but I want to get this in use so I will do that next.