Added in force-directed layouts and cleaned