Minor layout tweaks.

Changed numbers of current hero test skills, just to make sure new
navigation method works - however not sure we keep it for combat, maybe
just for over-world stuff.
Also tweaked RNG method to add one to upperLimit, as it seems to never
roll the highest value.