More changes to swipe ui thingy