Tidy up widget definitions