fix section conflict and fix hidden items
cleanup