Simplified UI and fixed manual return

Closes #596
Closes #597