Fix layout and add description