Added new graphics and updated layout