Update: Menu & Graphs

Temp Menu Fix and updates to the way the graphs are displayed. Tips
need fixing to reflect the right value.