Fix container/layout bug with Form JS