Bug Fix

Cosmetic updates
JS bug fixed