removed tap to click & added go back