Tidying up action rendering classes

@TODO - Work on handling classes that are also passed