Small fixes and name changes
Add import and export function GUI