Updated original graphics and fixed layout properties