Only two simple changes are required in every ui module:


Additional notes: