Removed storyboard/added .xib files + fixed bugs