Added tabs, not sure if it's the best UX solution though