FIXED: Update the default views for better compatibility