Added core ui, working on drag and drop/swap