no more gray background and some improve