Cleanup the admin and make it a little nicer
Cleanup import process and support "manual" importing.