Made a minor change to theme and corrected a issue with some controllers