Merge the lock view button, and improve its display slightly