Views and helper fixes