Added message to leads table and other minor cleanup