FE changes and style updates