additional fixes for design