Added navigation to building selection