Graphical fixes
Merge pull request #6 from XenoBen/master

Graphical fixes