Re-implement editable navbar

Change-Id: I2b55976275aa05a75863bb9448e7d14819a85c73