refactoring content view definitions , some fixes