Cleanup Text code a bit, fixed layer example