Cleaned up dashboard