Quick Cosmetic Changes for the Demo