solving issues for edit current rides and cancel button