Fixes on design.