Minor changes to tetrads screen, commiting in order to pull
Manual merge of userprefs file