[style] more .dubbel layout fixes