Revert "UI/UX: context 1/3" since tests fail

This reverts commit f9cebb3c07f89a8e5f5880124b7e7493adc419bb.