Added charting view and module changing capabilities
Some style changes and UI flow cleanup