There are reasons why the layout and signage have never been sorted.
When I was there 30mumble years ago Smuts was owned by the railways, managed by political appointees and staffing was reserved employment for idiots.
Now it is run by a state owned airports company, only the names and the colour of the faces has changed.