more layout changes and added "[ ]" in places