Update to the xib setup
Update to the custom UI