Updated FormLayout. Cleaned up JS