Small tweaks to Info / Edit screens