Improve banner manager. #259