Few improvements to L&F