move some constants into proper place
map tweaks
Add top layer and put link below it