Added navigation menu support