Porting more views to using addon-models