Top menu active state
Few improvements in top menu