Adapting some more views