For the next build I modified the STL so I don't have to glue extra pieces onto the bracket.
Disclaimer I am still waiting on some of these from 3dHubs so I haven't tested and this is my first time doing anything like this. I also removed the little bit of material in the cut outs of the button wells, I find that I normally cut these out anyway, it lets the buttons sit a little higher in the holes.
All credit to HoolyHoo for the original STL.
