Refactor layout and add tabPanel for different chart types