Cleaned up UI slightly, removed debug logging