Cleaned up views and added escape characters for currency