Removed generic_component, tidied up visualiser