Updated payment views, closes #337