Added relations and fields on models
Added layout