add retur and some UI changes