View management and functionality refactoring