Fix settings behavior (save/remove), Jshint fixs