[nim] Making layout better