L&F improvement and main class improvement