Adding some layout and domain models