Revert "UI for NW Discovery Happiness"

This reverts commit 287f7d4eb7140baeb17faf03e41305cf57fe3eb2.