Dlc 9 - Port over additional pages and fix navbar context

#13 
#14