move MapPanel to separate class and improve scaling
new test scenarios