Remove expend All option, and fix the security key formatting