Security key check completed and minor ui changes