More login and hazard table/icons