Updated layer management to reduce flickering