More Layout Updates and dynamic navigation