Fix bounds layout