added swap button, design to options