better look&feel #1