Added wrapper, made button bar, made buttons square