2nd update, still need to finish footer