cleaning up all over the place!
better refactoring  : display links and saving state