Added swap comment, reworked the UI