Fix route adding, layout fixes