Layout and dev update