A little tweaking - still need to work on homepage