prototype added, navigation tweaks