Minor fixes
Fix spacing when too many buttons