Several Updates to banner behaviour