added layouting