home view + fix
merge