Graphics reworked
