Tidied up render methods and fetches