Changes to L&F