finish layout and route -> header update