Improve some more views