Cleaned up log message output and click handling