Sump question

Here,s some pics of my sump would their be another way of doing it. The prob is with the water coming under the sand the sand can bubble up.
the sump came with the tank and it had matting in it , so i changed it for sand. Because i thought it would be better. Most sumps i see the water runs over the top of the sand. so would it be better to strip and move the baffles.:thumbsup:

This is my sump as you can see with the water going under the sand it can make the sand go all over. so what im wondering what would be the best places to put my glass cos i,ve taken it out and its sat on the floor at the moment.....