UI done, charts added,etc