Improved the content view structure and got all navigation working.