Added screen usage graph and cleaned up some code