forgot to add files last time, made a few tweaks on overall layout