More frames and formatting changes