Re-arranged fiel structure and added styles