Add some more layout