community section refactored and improved