Aesthetic and some functionality updates