More GUI fine tunes for #5.