Some more look and feel imrovements