Fixed server a bit, and added new view controllers