Added map/list toggle and UI elements