Fix layout and add components