Improved incapsulation
Add track map screen