Stub code to attempt to fix the null tag issues. Some styling changes.