Tidied up the render routine.
Restored the test app.