Sub navigation fix and cleanup