Added an informative message that is shown when the whitelist is empty
Cleanup
Rename some interface ids for consistency