Reorganization and adding some graphics