Bus widget ! And some cleanup.