moved cloak on to the username and added a spinner for route change