Revert "With XIB"

This reverts commit d1020f096fed190371e3495b0e238579dfd8c250.
With XIB pt 2