Changes to keep small buttons square