orange overlay and frame
fixed merge conflicts