fix nav active state and column margin