Update clientId for demo purposes
Start tidying up UI for non-showcase purposes