Fixed flickering and sizing