eod push, navbar cleanup mostly