Look And Feel fix