Added simple table layout for fields