cleaning up models, removing need for base model, cleaning default layout