Incidentally, the cradles included with some of the new enclosures aren't totally suited to the 40.
To start off with the chip goes in a different direction so that the battery/charge pinout is at at the top - you've got no choice in the matter as the hole for the screen ribbon is up at the top too - it's a pity because the concept is actually pretty decent as the cradle secures the tactiles without having to use glue, you can screw the charge board on to it.
I was fortunate enough to have access to a 3d printer so I replicated DarthPistachio's cradle using sketchup and printed one out - certainly tidies everything up, the only glue I used was some epoxy to secure the charging board and tactiles.
It's not perfect but it's clean-ish;
Now if I get sick of the enclosure, I can de-solder the tacts/510 and take the board out.