changed navigation and sample data