Layout and description fixes