Revert "Redesign project fix_3"

This reverts commit 4f162cfd268a4f7ac62b7f8c857d4c5172195359.
Revert "Revert "Redesign project fix_3""

This reverts commit 45965c5f534692171ecb53fe8f67e70268b7fc2c.