Refactored related content for manage theme + small bug fix for fe