Minor fixes and clenup in views