I merged this by hand, plus topbar/login/logout/reg buttons work.