New scalebar, improved layer control

Both versions are up to date