Fixing lock/unlock visibility throughout

also minor tweaks to layout of Unit entity.