Tidy up and updates to match other widgets. Version to 0.2.4