finish hw 03 and 02 change layout 01