template clean up, topbar view better user logic [MJ-858]