Starting to refactor Layouts and CalloutLines