Small refactoring
Tags refactoring
Decision/Fork menu, work in progress