Need to check if having the boxes is ok with them, or at least give better UI.