Updated layout and corrected graphing issue