Took me a minute to see him in there. Everybody will come in here and give you ideas and suggestions, it's what we do please do not take it personally. My first suggestion is to bury the waterbowl down into the substrate so it's even with it. I do wonder if it is a little to deep for him though? Where does the water come up to one his shell and can he easily climb in and out of it? The substrate is looking a bit dry to me, is it? What are the temps and humidity like in there? Might want to take one of those hides (like the one under the light) and making it into a humid hide. You can do that by just placing long strand sphagnum moss in there and keeping it damp. By being under the light it should hopefully stay warm (depends on what temps those lights are sitting at and what you use at night for heat). What's on his menu?
your first attempt isn't bad. I agree with Jacqui on the few tweaks. At the bottom of my post are great threads for raising a sulcata. They are Toms, a forum member. The leopard thread will apply also.
. I'm teasing. I could not help myself! 
