edited layout for neatness