views now properly formatted, new helper functions used throughout