Feature/adding logic to sidebar