[FIX] Cannot delete both servers if you add a new server without saving now

RT-2106
[FIX] Announcement banner UI fixes
Merge pull request #1463 from mrajvanshy/banner

[FIX] Announcement banner UI fixes