cleaned more views
minor view changes