Revisions of layout and some corrections