Getting location info into display options was really messing things up