Navigation Improvements Clabs maps<->list