Some Improvements on Feature-Widget Demo App