#254 - Clean up task rendering a bit