User interface fixes #17256