Fixed layout in xib
Fixed layout in xib
Merge remote-tracking branch 'origin/master'
Aligned and changed a little the merged code to fit the codebase.