Updated graphics + small performance improvements