Icons and better look and feel