Layout fix and updated EmbeddedJavaScript