Data import, fix bugs in display