both data working. styling almost complete