Fixed bug and merged UI changes

Fixed Bug that was introduced from changing the List of layers to a map
Merged changes to in TrainTerrain with the separated JPanel file.