Improve setup layout (nobr tags)