Chenged some more things in Presentation model