Added labels to boxes
Final changes before demoing it