updated layouts and names