some fixes on design toussa