Improve layout import, add Stata import