move
Big checkin. fixed tests + manual move html elements