Clean up review logic, fix cancel button