Clean up imports; work on discs tab