chagned layouts abit, trying to get it routing correctly