Basic layout adjusted