Rendering the page on destruct if not rendered
Merge branch 'feature/CleanUp' into release/0.0.7