Added new graphics + ui changes