Revert "Revert "Sprzatanie i fix laga i errorow z laborki""

This reverts commit 71414c62e01e85c7a4fd3edf719d4e951ece513d.