Updated save functionality and added tab retainment
Tab retainment fixed