moved map
better buttons