Graphics improvements

On student part.