Adding remove funcionality and improved navigavility.