Refactoring and cleaning current JS + beginning bookmarking
Cleaning server side + more config