drag n drop fix 2
refactoring, crash fixes
crash on resume fixed
lint fixes