Adding layour and route changes