Fixed graphics and alignment issues