More work on the features widget