Change location of the lock icon and add a label to the status