Changed layout system further