remove un-used things
refactor views
merge home changes