working on final map layout and fine tuning