Added notes tab and corrected associations