#21 improved

added lock drawables and repositioning of the lock button when the
configuration changes