Fix bug with whitelist at homepage and fix UI