approve and cancel function updated, ui tweaks