Home navigation fix v3