Added stub drawing for key elements