Added More Structure and Temporary Nav System