Cleaned up tenant admin and design changes.

cleaned up tenant admin and design changes.