Some additional changes to the look