L&F improvements. And bug fixes