Added droppable areas
Small refactor and bug fixed