Revert "Breake app a little:)"

This reverts commit 1f6408180ea7253af1572b515fa422dc436eaf7f.