Added xib's to demo and fixed some bugs in the main controller.