[*] refactoring in controllers and views