Separate  module for rendering code
Better rendering