Alignment tweaks and autosized buttons workaround