code refactor done,waiting for UX
issues fixed
minnor changes