merged basic maps functionality with layout