Cleaned up layout with graphs