Minor changes, add live charts view (not finished...)