added some more layout