Fixed regression in BaseAdapter, added back navigation