Danny,
It's looking good!!
I like the layout and all your preperations. Are you going to run lights? Those underwater ones are kind of pricey, but a string of low voltage lights around the area really set it off, especiall a spot light or two on the waterfall.
Your dirt for the water fall apears a little loose. It could be the picture, but if it is loose soil, you could have movement issues down the road.
I hate to undo your work, but I'd highly reckomend you put a hose to it, then start mixing it with your fell until you can grab a handful of it and squeeze it, with it holding together. Then put it back into position in layers usuing your fell to compact and spread it.
If you do this, it will be much more solid, less likely to move and hold it's shape better. Then when you put your liner over it and then your rocks, you will have a solid base.
I also like to have a slightly lower spot in the bottom for the pump. When you drain your pond, it does a better job. You will also be able to put the pump on some bricks leaving a space underneath it for sludge, and debri to settle in one place that wont place your pump at risk by moving it.
Keeping the pump as far away from you water fall is a good idea for circulating the water.
The shelves are a nice touch for plants that prefer shallow water, but I would only have the shelves at a few places and kep the sidewalls as steep as you can. Those shelves get used by racoons and cranes for killing your goldfish. If there is no easy way in and out, preditors have more dificulty getting to your animals. You also minimize the warmer water for algae to grow.
When you get to planting plants, I found that the plastic bins used in kitchen sinks work really well. Prices for the planters specialized for ponds are crazy.
Another alternative to mortoring in the rocks is liquid nails and expanding foam. Both work great, but are gonna be more money then mortor. Walmart has them much, much cheaper then any body else.
Hope I helped,
Eddie