Align buttons with right edge of type labels and closer together