Merge, remove notification section and fix FC under generalUI