some look and feel improvement