Updates to base layout and type rules