Controller: more robust storage checking and style change