Small bug fix and added another box