Added display button and some alerts