more refactoring of view structure