Add drive specs and login test helper
Re-nest form columns and fix labels