Exit button related changes