Revert "GUI + czytelnosc kodu + magic numbers"

This reverts commit ab57383293414dfa1d74014e2478fe979f835531.
Spowrotem do kodu sprzed konfliktow