Pushed everything into the main storyboard