fix navigation issue, design issue