Removed xib and improved main storyboard logic
merge with server branch