Added some more look and feal changes