Refactored sidebar + helpers