Config bookmark and fix bugs