Encon JS and layout updates