Content updateded and improved navigation