Fixed look and feel, clean LOG code