Added field icons and styled