Basic layout changed, added sections