cleaned up tabs, moved swipe to layout