Improved code behind the options banner