UI fixes and older XCode version support

Support out of the box for older XCode versions