Graphical improvements
Added map selection