Home navigation fix v2