Added look and feel changes