Styling and dnd fixes