Fixes layout, adds source badge to items
Merge branch '161-list-variables-on-search' into next