Completed UI changes as per Trello
Show confirm popup when the user enters the charts tab

 - Fix bug where accepting the disclaimer doesn't redirect to chart
merge with latest master