Some more layout ammendments