Refactor + prepare new toolbar