Added Swipe and Search
final before push