fixed app-router and added some guy elements