Refactoring, added drag and fixed tile collisions