Added some more graphics and tweaked some positioning