Once again moved rendering to screen class