Cleanup

House cleaning - on page load I now detect whether container exists or
not.