Fixed L&F issue on code