Cleaned up some code - added dashboard