removed view models in favour of contracts

see if I can augment using extensions rather than view models with the
same shape - less code
use single quotes
dismiss modal