Layout Changes

Major layout changes to account for new import/search architecture. File
import function changed as needed.