Styling cleanup/ icons / comments /email focus