Look&Feel improvment