Started on some of the visual changes