Added import functionality
Improved some layout components