UI fix IV + remove ECShop
Revert "UI fix IV + remove ECShop"

This reverts commit dfec95d6eb5771d49e932019b6af3514fcc378bd.
Revert "Revert "UI fix IV + remove ECShop""

This reverts commit 215e1b13e1b1cda7782dc13813a387f9b5dce68d.
UI fix V