changed layout a bit; corrected a couple of things