Minor ui improvement