updated layouting