Fixed rendering page issues