Added more models and fixed layout logic