added nk/nv columns to setups table, few tweaks to layout