More view related tweaks
Commit current progress