refact home
merge
test
refact js