Changes to make graph tabs look like tabs

Not completed yet, saving changes to pull from master
Resolving git problems