Worked on both rendering and menu.