Clean-up
Add a button to go to order from watch index