fixed, back button issue, needs to be tested