Layout corrected, implementing updates, also testing for errors