Little refactoring and added track slide views