Updated categories and corrected bugs in rendering.