Major update

Aesthetic and style changes