More look and feel updates