Fixes on design