updated basic layouting