Added button and fixed map layout