Improve layout for new sets