Fixes in the design