look and feel - fixes