Clean up payment views
Fix payment return