design and directive fixes