still some basic fixes with view and model