added moving background
fixed bg height
fixed merge conflict