Switch from nested children calls to find
Fix dir and num buttons