Tails can now be rendering with optional parts
Tidy up code and unify it a little