merged tesla.web

JUST THE LAYOUT