First Round of layout Changes