Improving Layout and Exceptions