Added some more graphics, changed to fill boxes