Adjust layout control and fix navlist