Minor fixes on design