updated layouts and preparing set up classes