Xcode 6 analyzer fix
layout box improvement