UI changes, add nav layout options in controllers