FInal Fix

Aesthetic modifications