Additional Graphics/ cleanup