Graphics updated
Tweaking layout