Improve quotas layout