Fixed map layout (removing stuff that doesn't work yet)