Layout rearrangement, navigation.js from _s