Track view added
Refactoring