More graphical improvements to match my v1 layout