swap location of lock and show/hide
border width is 0 when controls are hidden
Moved loading spinner icon; using opacity instead of display.