Removed magic constants from the expense graph layout
Removed unnecessary stuff