line chart code & GUI cleanup

Change-Id: I5d62a22d0ee698c39037668f02c9f4c889ab377e