- Bug solve
- View refactoring