UI cleanup
Working on testing the RequireToken filter