Refactored field definitions for rendering. Should make css more structured