Improved Theme Options for Top Navigation