1st look and feel update