Updated layouts, Navigation, chart rendering