fixed more layout bugs, implemented labels in rectangles (rudimentary; still need to fix sizing problems