Feature/import design

Fixes for import page designs, error messaging