Fix for Instructor Style plus default File Storage fix

Fix for Instructor Style plus default File Storage fix