navigation implementation

split first block in two