screen lib refactor
moved toolbar in own file